GtkStyleProperties: Merge font descriptions on merge()
authorCarlos Garnacho <carlosg@gnome.org>
Wed, 3 Nov 2010 10:36:18 +0000 (11:36 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Sat, 4 Dec 2010 14:38:34 +0000 (15:38 +0100)
commitfb8de847df03b91d3e6f0674021af1fa1ba543b4
treeb81a9ea36e69f3fca0d638b05b5b450c74ae819a
parentaf20ba6103d0eae66fc860d6a97af165f2ffd0f2
GtkStyleProperties: Merge font descriptions on merge()

This is necessary so incomplete font descriptions are ensured to have
family and size.
gtk/gtkstyleproperties.c